build gdkwindowimpl

2008-08-01  Hans Breuer  <hans@breuer.org>

	* gdk/makefile.msc : build gdkwindowimpl

	* gtk/gtkwidget.c : fix c99ism - declaration needs to be at the
	start of a block

	* tests/makefile.msc : update

svn path=/trunk/; revision=20926

diff --git a/ChangeLog b/ChangeLog
index 250e739cc6bf3a3c6cfbf5112b81d873e69a9a54..1f0a6241c9f21c6447479b921d265829109bf565 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-01  Hans Breuer  <hans@breuer.org>
+
+       * gdk/makefile.msc : build gdkwindowimpl
+
+       * gtk/gtkwidget.c : fix c99ism - declaration needs to be at the
+       start of a block
+
+       * tests/makefile.msc : update
+
 2008-07-31  Cody Russell  <bratsche@gnome.org>
 
        Bug 56070 – Can't click button after setting it sensitive.

diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index fb61c32a2d80ee7b93c93f40eb1496ceada95e6c..35e646723742a5a7301bf32a27fe81223c21a639 100644 (file)
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -91,6 +91,7 @@ gdk_OBJECTS = \
        gdkgc.obj \
        gdkglobals.obj \
        gdkimage.obj \
+       gdkwindowimpl.obj \
        gdkkeynames.obj \
        gdkkeys.obj \
        gdkkeyuni.obj \

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 6d92f0d24b1a85cae5be60b8e5ceadc24a042dc3..8ae7de6fa71569013767e3032a2f98e4f26abf53 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8067,9 +8067,11 @@ void
 _gtk_widget_set_pointer_window   (GtkWidget *widget,
                                  GdkWindow *pointer_window)
 {
+  GdkScreen *screen;
+  
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  GdkScreen *screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
+  screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
   g_object_set_qdata (G_OBJECT (screen), quark_pointer_window, pointer_window);
 }
 
@@ -8083,9 +8085,11 @@ _gtk_widget_set_pointer_window   (GtkWidget *widget,
 GdkWindow *
 _gtk_widget_get_pointer_window   (GtkWidget *widget)
 {
+  GdkScreen *screen;
+
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-  GdkScreen *screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
+  screen = gdk_drawable_get_screen (GDK_DRAWABLE (widget->window));
   return g_object_get_qdata (G_OBJECT (screen), quark_pointer_window);
 }
 

diff --git a/tests/makefile.msc b/tests/makefile.msc
index 9018d058799dd0acdd37f5f4dfeb8929f5a0ab9b..cc6c69cd831e5089c0df32b3d756d4d6b609720e 100644 (file)
--- a/tests/makefile.msc
+++ b/tests/makefile.msc
@@ -41,7 +41,8 @@ all : \
 #
 TESTAPPS = \
 #      autotestfilechooser autotestfilesystem \
-       buildertest floatingtest objecttests \
+#      buildertest floatingtest \
+       objecttests \
        testaccel testactions testassistant \
        testbbox \
        testcairo testcalendar testcellrenderertext testcombo testcombochange \
@@ -50,17 +51,17 @@ TESTAPPS = \
        testfilechooser testfilechooserbutton testframe \
        testgrouping testgtk \
        testicontheme testiconview testimage testinput \
-       testmenus testmenubars testmerge testmultidisplay testmultiscreen \
+       testmenus testmountoperation testmenubars testmerge testmultidisplay testmultiscreen \
        testnouiprint testnotebookdnd \
        testprint \
        testrecentchooser testrecentchoosermenu testrgb testrichtext \
        testselection testspinbutton \
-       testtext textbuffertest testtoolbar testtooltips \
-       testtreecolumns testtreeedit testtreeflow testtreefocus \
+       testtext testtoolbar testtooltips \
+       testtreecolumns testtreecolumnsizing testtreeedit testtreeflow testtreefocus \
        testtreemodel testtreesort testtreeview treestoretest \
        testsocket testsocket_child teststatusicon \
        testthreads testvolumebutton testxinerama \
-       simple 
+       simple
 
 # syntax error : illegal character '-' in macro
 #stresstest-toolbar
@@ -101,8 +102,8 @@ EXTRA_OBJETCS = testsocket_common.obj
 EXTRA_OBJETCS = testsocket_common.obj
 !ENDIF
 
-$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj 
-       $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) pixbuf-init.obj $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
+$(TESTAPP).exe : ../gtk/gtk-win32-$(GTK_VER).lib $(TESTAPP).obj $(EXTRA_OBJETCS)
+       $(CC) $(CFLAGS) $(TESTAPP).obj $(EXTRA_OBJETCS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) \
        $(PANGO_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(EXTRA_LIBS) $(LDFLAGS)
 
 $(TESTAPP).obj : $(TESTAPP).c